bitset: Don't overflow when splicing

Testcase added.

diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c
index 27cdf1ba631cd790af4c223f4fcf8583499cadd0..1ee80500c999b8973e2970fc82e42722f759017c 100644 (file)
--- a/gtk/gtkbitset.c
+++ b/gtk/gtkbitset.c
@@ -742,7 +742,7 @@ gtk_bitset_slice (GtkBitset *self,
       GtkBitset *shift = gtk_bitset_copy (self);
 
       gtk_bitset_remove_range (shift, 0, position);
-      gtk_bitset_remove_range (self, position, G_MAXUINT - position + 1);
+      gtk_bitset_remove_range_closed (self, position, G_MAXUINT);
       if (added > removed)
         gtk_bitset_shift_right (shift, added - removed);
       else

diff --git a/testsuite/gtk/bitset.c b/testsuite/gtk/bitset.c
index e5e641a17bdb492692bd592f7926349eb2c5a38a..8a84648324e868a34e0340a40a5ce36ebdd411d5 100644 (file)
--- a/testsuite/gtk/bitset.c
+++ b/testsuite/gtk/bitset.c
@@ -543,6 +543,18 @@ test_iter (void)
   gtk_bitset_unref (set);
 }
 
+static void
+test_splice_overflow (void)
+{
+  GtkBitset *set, *compare;
+
+  set = gtk_bitset_new_range (3, 1);
+  gtk_bitset_slice (set, 0, 0, 13);
+
+  compare = gtk_bitset_new_range (16, 1);
+  g_assert_true (gtk_bitset_equals (set, compare));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -562,6 +574,7 @@ main (int argc, char *argv[])
   g_test_add_func ("/bitset/slice", test_slice);
   g_test_add_func ("/bitset/rectangle", test_rectangle);
   g_test_add_func ("/bitset/iter", test_iter);
+  g_test_add_func ("/bitset/splice-overflow", test_splice_overflow);
 
   return g_test_run ();
 }